gnus-sum.el (gnus-summary-expire-articles): Revert last change

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 832950772d23972bbd63310c4d6e5995ac4244e7..a294b4c42e25a664762e9aaae9977a3c9698b39e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-sum.el (gnus-summary-expire-articles): Revert.
+
 2014-08-05  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
        * gnus-sum.el (gnus-summary-expire-articles): Functions registered to

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 4f061cd9f329bda3862e11eb4c207f7d3f60d605..c0e099ba3ca13ddbff9033171bf29b255accc0c4 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -10449,10 +10449,7 @@ This will be the case if the article has both been mailed and posted."
                                        (gnus-data-header
                                         (assoc article (gnus-data-list nil)))
                                        gnus-newsgroup-name
-                                       (if (fboundp nnmail-expiry-target)
-                                           (funcall nnmail-expiry-target
-                                                    gnus-newsgroup-name)
-                                         nnmail-expiry-target)
+                                       nil
                                        nil)))))))
        (gnus-message 6 "Expiring articles...done")))))